changed some privates