CA changed for buffer ind. some mods