GMX: Code Changes