editor enhancement, still needs more enhancements