I think old count no longer valid and we must switch to the new one.
SPX - long term
This is more pessimistic one... instead of wave X in global correction SPX is finishing wave 5 which took form of ending diagonal. This means we have some more upside to 1580 area but after this mark everything becomes dark...
SPX - short-term
Fibonacci cluster is at 1585 and people should exit their longs there... Still, it does not mean you should go short right there.