Faction update, restructure
again...Faction update