UPGRADE: makeme updates
FIX: idebuild