Corrected movement

added self-healing