changes by Greg