Move tracking under else statement