- adding some of the changes for the rewrite