ETHFI: Code Changes