Changed wierd stuff