merging rameen's review

merge