fix after test file
working with selection
simplify