changed to inheritence structure