Changed from m16 to m4