Selection Adapter modified