Working on fixed display export