todo remove for secondary format