Added proper editor