update for new configuration
merge