Adding more polish