Lastest version

Various changes