Setup for 1.6 work