Integrate from Limors branch