Speed optimizations

Home/Speed optimizations