updated according to new class diagram