Feature/tp safe to contact