updating for new token changes
eliminated warnings