further changes to tokenify