less paranoid locking
trim the fat