Bringing things up to date with holeman's project