Updated version correspondingly