fixed data moveing stuff