NBA rework almost there