Another optimization-heavy update.