Insert Samans changes to reply after moving, videodir fix