Can you make this a separate pull request + tests please?