Added working checkpoint system