setups changes for 2.7