updating from the findcause branch as of 9/7/2013