Same updates as the 1.02 PR