some things edited