Resetting to my own, simpler boilerplate