Changed some stuff to true