Improvements from working session with Ryan