some extra optimizations, back under 4k