more updates for building tokens.