Adding a few changes that were made on Gordon before running [ci skip]