update2 .it is still a WIP