Rearrangement and new nipa parser