Extra commented code to help (or perhaps hinder?)