Add more reworks for design