Updated to final version