Changed some stuff around.