Everything by the numbers

Signed-off-by: fabioribeiro <fabio.ribeiro@synchro.com.br>