Even more hacks
Finish optimizing