Craig's album load patch
Craig's stream patch