More updates with Sam's addition