Update in design regarding points #1