This paper focuses on predicting the End of Life and End of Discharge of Lithium ion batteries using a battery capacity fade model and a battery discharge model. The proposed framework will be able to estimate the Remaining Useful Life (RUL) and the Remaining charge through capacity fade and discharge models. A particle filter is implemented that estimates the battery's State of Charge (SOC) and State of Life (SOL) by utilizing the battery's physical data such as voltage, temperature, and current measurements. The accuracy of the prognostic framework has been improved by enhancing the particle filter state transition model to incorporate different environmental and loading conditions without retuning the model parameters. The effect of capacity fade in the reduction of the EOD (End of Discharge) time with cycling has also been included, integrating both EOL (End of Life) and EOD prediction models in order to get more accuracy in the estimations.