commit and remove adddataController and latest change in location