removed shitty if statements