better lock support