some work on token and mbf component