fixed merge conflict with studies-family fxns