UPGRADE: makeme updates