Updated to be more in lines with a CV