better contacts handling
built