adapt word-at-a-time commits

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>