Improves BWT support
solved merge conflicts