Metrica + some changes