fix ints
fix code duplication
fix
fix
fix
fix
fix
fix
add
add
fix
fix
fix