Added buffer move