renaming variable
moving stuff around