IMX: Code Changes