Been thinking about optimizations...