An improved model for the combustion of AP composite propellants