Change some stuff around