Deleted and re-added some code