New configuration, adapt existing code