more rearranging
it workssss