ninja added, some architecture changed