Improvements from Ben