Tomas Jensen' discussion edit