Fixing comments v3