implement review comments from Sinan