Updated Phd thesis