make noodle locking less stupid