added current token replacement