More progress on public part