Workaround for PUT request, refactored new spot js and ...