improvements in w13-1