More dynamic values in Swap