adding markup back in for now until the 1.6 clean up