change variables names... make more sense