Added whitestone/blackstone, per demand