Updating from yruablaze comp ^^

We coded this!