Some improvements made