fix
float to int
modularization