Added a few changes for previous deletions