Adding new setups and rearrangement