minor changes before implementing doctor's side