Address comments from jgraham and ehsan