changed more code for recent changes
Merge branch 'master' of github.com:WeAreDev3/lockdown