Updated to reflect PR comments