merging eisq code