bug fixes, dummy integration not working right now