Made some changes to correct doctors problems