Change some stuff here and there