Amended code (minor)