Rearrange Bluetopia stuff part 4