Changed modifiers to public