Added suspend resume
merge