Changing code for legacy support on Aragorn
Changing code for legacy support on Aragorn