finished up first version