@jarens, thank you. doesn't seem to be an easy way out of this. restructuring is probably the best thing to do.