In the middle of fixing update; fixed cross origin issues