BS-9315, move code