Sync with Will and add best comment