add changes from millo1978 to Phone
readd these