Some changes, update to thread to fix double post.