adding support for better saving