Updated with no more exceptions on new uri