Changes for the first version