New setups to be consistent