some new and edit