Update for changes that were added since I first started