minors changes in variables