Some new files and slight mod to sample_wtatage