the naive implementation of the new interface passes tests now