Minimal changes
tests not fixed yet