updated to match latest config