Places Optimizations

Places Optimizations