Added some stuff for greg