This is the branched code from rcjbosstester