Move 2.4 to 2.6 and update