Reorganised integration method using -i switch
Introduced -r (reset) switch