updated with review comments