Added all new changes up to 2.6