changing some methods to package visibility