further work on form saving