Adding checks and url checking