More changes as I get smarter