NL6: legacy code

NL6: legacy code