add advanced and super advanced. clean up markup.