Updated to keep Sammy happy.