update for code review feedback: rename,  use done instead of then etc