Updated to the third version