fixed add api
Merge branch 'wierd_refactor'
editing properties