Bug fix: make hard coded URL's based on variables