change according to new design. Not finished.