rearranging things and adding hopper