added basic contact handling