more work on lockup