Ashkan: the comments from final pass of code review are addressed.