Thesis improved