added file locking
7 files changed