Reworks some stuff