generator and returner cleanup-- moving to iMac
merge