Adding back in changes to the new branch.