Finished adding the functionnality