S first commit plus update to selecters