Changed some methods from public to private