some updates after preselection fix