fixed var names
still exploring