Rearranged repo a little