Thanks - I'm updating commit according to your comments.