fixing up some stuff for Greg