Did you manage to get through this? I'm going through the same thing now.