MEDIUM / New attempt to make all tests pass