Updates for change in API, SB's comments