Changed some stuff around more