fix off method + refactoring
add capture method