Redid some stuff.