updated to Goweb 2