FIX: makeme integration