Ashkan: all the comments from code review are addressed.