made some changes, removed token