clean up
add different tokens