Removed private vars for now