Changed more stuff