from Chris_G's SVN repo
fix up to run on labs