changed to support magazine configuration