Add if track conditional back in. Closes #4.