removed lock code for now