Some improvements have been implemented