Changes to the first version