improved for xweb v0.1.1