Added edit session, not tested