Updates for fixing the forward movement