Started conversion to new style state, input ext