I made some changes to Aitor's code, that I would like to discuss
tomorrow with everyone.