Added working comments