Updated version of thesis