final changes to first version