Doing a lot less useless work for complexity > 1