adding more robust comments