big restructuring; still quite  a mess now