Changed some stuff to be better