Prepared for new design