Changed some access modifiers