full mark-up v2