removed extra checks