added some additional locks...