Optimizations
Optimizations and file saves