Make this fully configurable