Should solve CONS, can't check though so may need more work.