Added logic for new design.