and then this if statement can go away