Changed a bunch of publics to private