maybe “was doing” could be changed to “has been doing”?