merged sams changes