Update so it works for 1.1 and up