Keep order and update the setup a bit