edit 2.1 & file lock fix