new version

not wokring correctly yet