Changed some stuff to private