more phones + refac
conflict fixed