During the process of merging with Marysia's code
Code succesfully merged with Marysia's