Improvements from Christopher