Fix to next level functionality