Changed a lot of shit