Incorporate Sams stuff