Updated to take url