Preparing to fix delete bug.