Minor changes to greg