changed sam around a bit