introduce some changes to make testing easier