Made slight changes in preparation for deletion