it's almost working, fixed some janky variable names