Improve the keeping system