Polished off the first version