added save / restore + options