improve saving speed to limit timeouts