split adapter in 2, fixing refresh bugs