Changed basic structure.