minor changes to reach the 20 pages limit - adrien
merge