Added selection + Wahiba corrections