structure changes, renamed variables