Some changes and stuff...