To address David's review comment