add changed according to new design