Working version but not sselecting properly