Update for 1.1 vs tip