saving point, adding testing