Issue 185_v2: Comments covered