Added some modularity to the commented out parts.