Merge Sam changes