Changed some thingies