changes for web controller, hopefully it doesnt break anything
merge license