some changes to funcionality/selectors, simplification