Added doctor stuff
fixed conflicts