Stable version with new structure.