update #15 according to scan