All Computations Added and tested