12 Commits (new-arch)