BarAPI fixed up, yays!