Updated with better contact