adding greg's stuff