changed some stuff
doctor_message conflict fixed