redesign + unsolved changes