added saving features