Reverted to standard selection model