Actually make this suitable for publishing... lol