changes to make more configurable