Updates to pull out numpy etc. from Justin's text