Merged Roana's code
Merged Ronan's code