changed back some stuff