Now can handle version A and B data