added fixes from r2_comtacts