updated checks and added url option