Updated to reflect new URLs