added configurable version