changes in Selection/ bug fix