a lot more polish for Metis