Updated to be more parameterized and not always refresh data