sauyon wants me to commit T_T
added more variables