resolves #59 and adds more precise expressions