Added self-homing control