Private methods changed to protected/public