updated to match current configuration