Prepare for n-2.0