@inez should probably do that refactoring, though.