monica vali: TODO: this class should not be here