Remade a lot of stuff