Setup for 2.6