added callback url
merge changes and added back some stuff I had in