Update 12/1 according feedback