better CODE handling...