Complete the first version