Rewrote & Added Champ support