Bring code up to date with blogpost