remove repeat of almost same code
fix met name