updat to be more configurable