some more [exp] changes