adding in all changes