Less of a dumpster fire than last time