Including samples in the yard generation again