Reintegrate some of the developpement made in 2013 but not commited