Add phone to tips
Merge with master