Final version for submit