Optimizations and tweaking for final demo