Changed some stuff slightly.