Removed hard coded T and P values