Bring mate set up to 1.6 release