Actually after looking at this more I see you've made major changes to the output in general... so it might make sense to stick with your current approach.