Added new heading code, needs test