Major updating

Trololo, LOL