Insight branch + new arch