New result structure and many importants code rationalisation