cleanup the custom token parameter and let us use a lambda