BW3 style update
Merge