Added switch to turn off data movement constraint