change for greg
merged file with both changes