[*] After code review