a little more clean up and a new version