Slight changes to make testing easier