Many changes (still not quite right, it seems)