forgot to remove old if statement