modified to match new config