Incorrect calculations but graphs added