added variables to Op. merging my code w/ Aarons