fixup! Made specific tokens to use logic as int. May be a waste of time?