Changed methods to private