Updated everything to include part 5