does this if statement still need to be here?