Changed some stuff
Wrote some stuff to reduce assumptions