finalizing first version