After massive refactoring, stable again