Changes from iguana applied, still doesn't work with tokens