Adding in buyback information and general updates