Added dirty markup
Some merges