Doc mode polish