Checkpoint. About to fix case error