fixing sam's stuff
merged with vincent's stuff