Migrated to minimal-mistake