update helper
refactor drive & test