Prepare new design (#24)