Added M21 code to use remount