Final update - slight config changes only