Solving on CN works

minor changes