Make dramatic changes to minimize locking