removes if statement from previous version