Changed token order