removed tokens and changed order