Prepare for new design