Latest changes ( partial implementation )