Some improvements were done