MIGRATE TO NEW kOTLIN
fix inheritance model