Working on Edit Doctor