Removed if statement per request from adamnicholsons