latest rev, session token not working
updated to refactor