Changed access to more private