updated with new config parameters