removed line below url and removed check for id