Modify to work with Markdown