Tring to fix deploy
Proxy working
Merge
Fixed undeclared var error
Merge