Draft - better markup