made editor more flexible