some simplifications to