REMOVED if statement