Added shock capturing on CPU