fix: witho
add: some functions