Alessio and Anne-Lyse additions
Merged