Changed some stuff before merge.