final dev changes for merge; this was the version used in the study