changes from irreducible configuration shooter forwarded