Changes for ALENEX

Changes from SODA comments