Preparation for re-design