Changed some stuff I think