No more underscore for now in tray