Merged some Ritesh code and expanded shakedown.