fixed the public part