Also, make this an if block