Update for baffin