Updated to Simple Optimizations (to avoid errors)