New version

almost done