#70 added throttle to save