New version initial work