Better callbacks and global editor