General update. Addition of preselect.{C,h}