updated to post-sample working copy