baffin specific changes