Adding commits from Neil Patrick Harris #likeaboss