Will improved (8/32)

Will improved