updated to latest editor api
In process of updating everything with editor api