cleanup
add tint2