Re-scaff again