Changed some stuff to be mine