Added more optimizations!