Working on our new version

Working on our new version