Added all markup from Adam