Modernised athena2nexlt