Updates following feedback