Working on public part