updated with latest configuration