NL FIX
RESTRUCTURED in preperation for commit