Add final version 2