merging with pantelis