continue ut and refactor