rework of coding and design