Original commit - post-assignment
It almost Thomas'd