passing all current tests with latest architecture