added comments, and temporarily commented out code