simplification --> assumptions, updated class diagram