Few changes

TODO selection and detection blocks