Split processing into old (Prod 6) and new methods