Army came out with the M-16A2 version, which fixed the M-16's ammunition problems, added a chrome-lined barrel and chamber, reconfigured the magazine to increase its capacity, and permanently configured the rifle for safe, semi-automatic and burst modes.

What about the XM 8 maybe?