Add more polish