removed stupid if statements