change logic and selection