Now have both ways of calcutating MT and WPT