improved support for bwat