work on bug 584733 to address review comments