Update final version with testings