changed access modifiers back to public