Integrated version 4/29