Part 1 of public image fix