override points are added, some private methods/properties are changed to public