Thomas Lundquist, update for current structure