Update following feedback comment