Some improvements have been made