added checkpoint save & restore
removed camel case from method names