Start with the conversion to a better architecture