Began of delete and other changes