New content and some refactoring.