adding some of the changes