Some changes and stuff