Changed some stuff again