#3: small changes