Changes for first version