Added fancy animation thingy
Fixed conflict
Fixed conflict