Optimizations and controls

Last updated