Revised for the purposes of jenkins