Stable vers. before some refactoring.