Update device for CFX compliance. Credit CM