adjust to new design