[lock-unlock] improvement