Made more changes to TR and ProtoPanel