rearrange
stupid variable name bug.