Adding Rob review comments