Added a timeout to not save too rapidly