A few improvements have been made