fix(saving): capture data