Updated with more accurate addresses