updated checks
added url support