remove wrapper and root + add event support