fixed to run without local server