Added guard and movement