changed more var names