more optimizations betch!