added more locks