OPTIMIZE SOME MORE!!