Added locks
Imports were wrong because of file name change. Fixed