Updated to check urls