changed to support url