Simplify, fix underzooming performance