finish serve_static change