start fixing selection (not complete jet)