Enhanced markup v2

Think you'll like this better :+1: