Experimenting with putting the locks back in