added magazine support