RPA Toolkit
Added version 2 of the calc