removed OPT_A2 from headers