URLs update, round 2