Changed some stuff to public