Remodelling

@AlexanderHagenhoff