Adding comments / Modifying structure