refactor to override transformer