Formatting and added ENV vars
Checkpoint
Checkpoint
Checkpoint