Updated and Optimezed