Changed some stuff around