Worked on optimizations