CLEAN: interim checkin
UPGRADE: makeme updates