Changed a ton of shit