add / remove contact now works better way