added configurability