Stable version with Passage editing functionality