Additional updates to address Kevin's suggestions