Integrated improvements from Leo