Updated to work with ELANEX
Updated to work with ELANEX