speedup suspend...much more work needed

Change-Id: I5b2dfd8bb83f1d74c8efa7b864c96813f2766754