Changed A LOT of things XD