refactory to make propeditor included