Modified structures to add tr logic