edited variables, still needs work