stable working codebase - review 10-8