ADD::finger detection improvement