First steps adapting new style.