minor changes to allow for new use cases