Changed some more stuff in dori1