Added perms run
merged tim's changes
removed lock file