Changes proposed by hanno