Changed Internal Access Modfifiers and fixed previous commit