* Addressed review comments