Much more polish everywhere