Some improvements done.