merge pascal + ivan