Adding @bdbaddog's changes to repo