Updated to use buhmans config