draw lock improvements