committing changes for part 6, thanks @gastaldi for the ping