Ashkan: small changes