Checkpoint, things not working well ATM