Jan, I'm working on this now to update it and take into the review comments