bad commit, new architecture