Updated for use with Marked 2