Improved handling of economy stuff significantly.