Rewrote make rules, mapping