Updated selection-method